Fix tests

diff --git a/Cargo.lock b/Cargo.lock
index c54edbd8c354cf34d3b08b072a21b1f670f2b05d..0365deba3924cca508f6b2e34a88c4c1a77fba4d 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -160,6 +160,7 @@ name = "registry"
 version = "0.1.0"
 dependencies = [
  "curl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]

diff --git a/tests/support/mod.rs b/tests/support/mod.rs
index 6ac5ef48799cfe4562f1e87454e4f1992d7a6b35..4b7b949cec09c0d789cf769e2cff70f705848eb0 100644 (file)
--- a/tests/support/mod.rs
+++ b/tests/support/mod.rs
@@ -301,9 +301,9 @@ impl Execs {
             None => ham::success(),
             Some(out) => {
                 let actual = match str::from_utf8(actual) {
-                    None => return Err(format!("{} was not utf8 encoded",
+                    Err(..) => return Err(format!("{} was not utf8 encoded",
                                                description)),
-                    Some(actual) => actual,
+                    Ok(actual) => actual,
                 };
                 // Let's not deal with \r\n vs \n on windows...
                 let actual = actual.replace("\r", "");

diff --git a/tests/support/registry.rs b/tests/support/registry.rs
index 3fac53dcb33e5916df25688b64781265b69950b6..3fd6cf091a57f187f0dc5dcfa6833e5673df1c21 100644 (file)
--- a/tests/support/registry.rs
+++ b/tests/support/registry.rs
@@ -3,7 +3,7 @@ use std::io::{mod, fs, File};
 use flate2::CompressionLevel::Default;
 use flate2::writer::GzEncoder;
 use git2;
-use rustc_serialize::hex::ToHex;
+use serialize::hex::ToHex;
 use tar::Archive;
 use url::Url;